Merge
authorTom Wilkie <tom.wilkie@gmail.com>
Tue, 27 Mar 2007 13:02:17 +0000 (14:02 +0100)
committerTom Wilkie <tom.wilkie@gmail.com>
Tue, 27 Mar 2007 13:02:17 +0000 (14:02 +0100)

Trivial merge